merge trunk
authorKenichi Handa <handa@m17n.org>
Thu, 26 Aug 2010 03:42:08 +0000 (12:42 +0900)
committerKenichi Handa <handa@m17n.org>
Thu, 26 Aug 2010 03:42:08 +0000 (12:42 +0900)
commitb51057fbfaf277d25e7248a18448f313a760a09c
treeeb55120df32a4e7ed75689b798de17b4eb732901
parent26cec261c206843fd8eddee526ca565c67eec677
parenta1583c219a033f1a8b91782377c86104d14aeae3
merge trunk